Skip to content

CLDSRV-740: Add healthcheck internal route s3 port#5929

Merged
bert-e merged 6 commits intodevelopment/9.0from
improvement/CLDSRV-740-healthcheck-S3C
Sep 4, 2025
Merged

CLDSRV-740: Add healthcheck internal route s3 port#5929
bert-e merged 6 commits intodevelopment/9.0from
improvement/CLDSRV-740-healthcheck-S3C

Conversation

@BourgoisMickael
Copy link
Copy Markdown
Contributor

@BourgoisMickael BourgoisMickael commented Sep 3, 2025

Bring back the healthcheck route like it was in development/7.70

needed by S3C s3-frontend

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 3, 2025

Hello bourgoismickael,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 3, 2025

Codecov Report

❌ Patch coverage is 40.00000% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.16%. Comparing base (0c31285) to head (8dbaa91).
⚠️ Report is 9 commits behind head on development/9.0.
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
lib/server.js 0.00% 3 Missing ⚠️
lib/utilities/internalHandlers.js 50.00% 3 Missing ⚠️

❌ Your patch status has failed because the patch coverage (40.00%) is below the target coverage (80.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/Config.js 79.20% <100.00%> (+0.02%) ⬆️
lib/utilities/healthcheckHandler.js 90.19% <ø> (-0.19%) ⬇️
lib/server.js 75.56% <0.00%> (-1.45%) ⬇️
lib/utilities/internalHandlers.js 76.92% <50.00%> (-23.08%) ⬇️
@@                 Coverage Diff                 @@
##           development/9.0    #5929      +/-   ##
===================================================
- Coverage            83.19%   83.16%   -0.04%     
===================================================
  Files                  188      188              
  Lines                12095    12103       +8     
===================================================
+ Hits                 10063    10065       +2     
- Misses                2032     2038       +6     
Flag Coverage Δ
kmip-ft-tests 26.84% <40.00%> (+0.01%) ⬆️
multiple-backend 35.33% <40.00%> (+<0.01%) ⬆️
quota-tests 32.06% <40.00%> (-0.85%) ⬇️
quota-tests-inflights 34.04% <40.00%> (+0.01%) ⬆️
unit 67.28% <40.00%> (-0.02%) ⬇️
utapi-v2-tests 33.20% <40.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 3, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@scality scality deleted a comment from bert-e Sep 3, 2025
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds support for internal healthcheck routing on the S3 port to enable nginx upstream failover functionality. The implementation allows the healthcheck endpoint to be accessible on the same port as the S3 service when the S3_INTERNAL_HEALTHCHECK environment variable is set.

  • Conditionally adds healthcheck handler to internal handlers based on environment variable
  • Extends deep healthcheck logic to support internal route /_/healthcheck/deep

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
lib/utilities/internalHandlers.js Adds conditional healthcheck handler registration and imports healthcheckHandler
lib/utilities/healthcheckHandler.js Extends deep healthcheck condition to support internal route when S3_INTERNAL_HEALTHCHECK is enabled

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

Comment thread lib/utilities/healthcheckHandler.js Outdated
@BourgoisMickael BourgoisMickael force-pushed the improvement/CLDSRV-740-healthcheck-S3C branch 2 times, most recently from 3a6643e to e2433f9 Compare September 3, 2025 16:41
@BourgoisMickael BourgoisMickael requested a review from a team September 3, 2025 17:00
@tcarmet tcarmet requested a review from a team September 3, 2025 17:10
Comment thread lib/utilities/healthcheckHandler.js Outdated
Comment thread lib/utilities/healthcheckHandler.js Outdated
Comment thread tests/functional/healthchecks/test/checkRoutes.js Outdated
Comment thread .github/workflows/tests.yaml Outdated
Comment thread tests/functional/healthchecks/test/checkRoutes.js Outdated
@BourgoisMickael BourgoisMickael force-pushed the improvement/CLDSRV-740-healthcheck-S3C branch 2 times, most recently from d05a991 to 20aa021 Compare September 4, 2025 15:11
Comment thread .github/docker/config.s3c.json Outdated
Comment thread lib/utilities/internalHandlers.js Outdated
Comment thread lib/Config.js Outdated
@BourgoisMickael BourgoisMickael force-pushed the improvement/CLDSRV-740-healthcheck-S3C branch from 20aa021 to 8dbaa91 Compare September 4, 2025 16:47
@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 4, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/9.1/improvement/CLDSRV-740-healthcheck-S3C with contents from improvement/CLDSRV-740-healthcheck-S3C
and development/9.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.1/improvement/CLDSRV-740-healthcheck-S3C origin/development/9.1
 git merge origin/improvement/CLDSRV-740-healthcheck-S3C
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.1/improvement/CLDSRV-740-healthcheck-S3C

The following options are set: create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 4, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

@BourgoisMickael
Copy link
Copy Markdown
Contributor Author

/approve

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 4, 2025

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Copy Markdown
Contributor

bert-e commented Sep 4, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/9.0

  • ✔️ development/9.1

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.8

Please check the status of the associated issue CLDSRV-740.

Goodbye bourgoismickael.

@bert-e bert-e merged commit 4124dc5 into development/9.0 Sep 4, 2025
29 of 30 checks passed
@bert-e bert-e deleted the improvement/CLDSRV-740-healthcheck-S3C branch September 4, 2025 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants